Fixing regression in mergeDelayError #1712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattrjacobs
changed the title
|
I've confirmed this is the regression in #1699, and that this fix solves the particular use case shown in the unit test. A review is very welcome, as this is deep in the guts of the merge code which I'm not too familiar with. |
|
Thank you very much for finding and fixing this. |
benjchristensen
added a commit
that referenced
this pull request
Oct 2, 2014
…-regression Fixing regression in mergeDelayError
This was referenced Oct 2, 2014
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.